Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Thu, 27 Nov 2014 18:10:04 +0000 (13:10 -0500)
committerTom Rini <[email protected]>
Thu, 27 Nov 2014 18:10:04 +0000 (13:10 -0500)

Trivial merge